6ca84761936921162ec8f0467749138dd1d27b23,src/org/exist/xquery/DescendantOrSelfSelector.java,DescendantOrSelfSelector,match,#DocumentImpl#number#,42

Before Change


	 */
	public NodeProxy match(DocumentImpl doc, long gid) {
		NodeProxy p;
		if((p = context.parentWithChild(doc, gid, false, true,
				NodeProxy.UNKNOWN_NODE_LEVEL )) != null) {
			NodeProxy newNode = new NodeProxy(doc, gid);
			if (rememberContext)
				newNode.addContextNode(p);

After Change


        NodeProxy p = new NodeProxy(doc, gid);
        if (p == null) 
            return null;    
        NodeProxy contextNode = context.parentWithChild(doc, gid, false, true, NodeProxy.UNKNOWN_NODE_LEVEL);
        if(contextNode == null)
            return null;        
		if (rememberContext)
			p.addContextNode(contextNode);